Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 25 Jan 2006 22:35:22 +0000 (23:35 +0100)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Wed, 25 Jan 2006 22:35:22 +0000 (23:35 +0100)
commit606c67c6c9e132811d9613769dc35548c8b75cd3
tree7da2f58892349497657f21c49c1e24c316ecca3b
parentcbbdeefa83ee31b589fd365763b472afeef0108e
parent599275f6dd75bba2050803b52dd66324787b7abc
Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk